Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pin 3.0.x branch against Mapnik 3.0.x mason package #144

Merged
merged 18 commits into from
Jun 21, 2017
Merged

Pin 3.0.x branch against Mapnik 3.0.x mason package #144

merged 18 commits into from
Jun 21, 2017

Conversation

springmeyer
Copy link
Member

Addresses #143.

Currently failing due to #139

@springmeyer springmeyer changed the base branch from master to v3.0.x March 19, 2017 01:40
@springmeyer springmeyer mentioned this pull request Mar 20, 2017
Merged
4 tasks
@springmeyer
Copy link
Member Author

@artemp - just pushed a variety of minor build fixes to this branch. Can you take it from here? The next steps here are:

  • Get the tests 🍏 on travis. There are currently several python unit tests failing.
  • Once green merge this branch into v3.0.x
  • Port the fixes to master so we have consistency (might be easiest just to copy the files over, but I'll leave it to you how to port).
  • Get master 🍏 on travis

@springmeyer
Copy link
Member Author

Failures are now:

======================================================================
FAIL: python_tests.geometry_io_test.test_handling_valid_geojson_empty_geometries
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/travis/build/mapnik/python-mapnik/mason_packages/.link/lib/python2.7/site-packages/nose/case.py", line 197, in runTest
    self.test(*self.arg)
  File "/home/travis/build/mapnik/python-mapnik/test/python_tests/geometry_io_test.py", line 339, in test_handling_valid_geojson_empty_geometries
    eq_(json.replace(" ",""), out_json)
AssertionError: '{"type":"LineString","coordinates":[]}' != 'null'
======================================================================
FAIL: python_tests.geometry_io_test.test_handling_invalid_geojson_empty_geometries
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/travis/build/mapnik/python-mapnik/mason_packages/.link/lib/python2.7/site-packages/nose/case.py", line 197, in runTest
    self.test(*self.arg)
  File "/home/travis/build/mapnik/python-mapnik/test/python_tests/geometry_io_test.py", line 344, in test_handling_invalid_geojson_empty_geometries
    assert_raises(RuntimeError, mapnik.Geometry.from_geojson, json)
AssertionError: RuntimeError not raised

@artemp
Copy link
Member

artemp commented May 5, 2017

@springmeyer - the failures above indicate that python-mapnik is being built against wrong mapnik core version but I don't quite see where this need to be fixed.

@springmeyer
Copy link
Member Author

@springmeyer - the failures above indicate that python-mapnik is being built against wrong mapnik core version but I don't quite see where this need to be fixed.

@artemp - keep in mind that this is the 3.0.x branch building against mapnik 3.0.13. Do you still think these failures are expected or are they fixable in the tests for this branch?

Dane Springmeyer added 8 commits June 20, 2017 10:26
attempt to build against mapnik 3.0.13 mason package
541ae9d
use latest mapnik 3.0.x package that disables the soname
64a18f4 
  - The 3.0.13-1 package builds mapnik without a soname
  - This takes advantage of that by expecting a non-versioned, non-symlink library name on linux
  - This is important when packaging portable binaries to avoid copying only a symlink and leaving a broken install
upgrade mason and method used to install mason
2216c1e
fix mason install
794d6d2
update to latest mason release
7f39f6e
add -Qunused-arguments to CC as well to avoid verbose build warnings
807c937
remove crash handling to make it easier to see errors in logs
e859c66
add postgis, remove unused 3rd arg
67ea229
@springmeyer
Copy link
Member Author

springmeyer commented Jun 21, 2017 •
edited
Loading

This is green now. Now building against the mapnik v3.0.15 mason package @artemp created.There were some test changes to pgraster than I could not fix, so I overwrote them and ticketed at #155. Next step:

  • merge this
  • port relevant changes to master, get it green.

springmeyer pushed a commit that referenced this pull request Jun 21, 2017
start porting #144 to master
5c2d91c
@springmeyer springmeyer mentioned this pull request Jun 21, 2017
Merged
@springmeyer
Copy link
Member Author

port relevant changes to master, get it green.

-> #156

@springmeyer springmeyer merged commit 0cd7493 into v3.0.x Jun 21, 2017
@springmeyer springmeyer deleted the v3.0.x-mason branch June 21, 2017 00:38
This was referenced Jun 21, 2017
Closed
Closed
Closed
springmeyer pushed a commit that referenced this pull request Jun 21, 2017
start porting #144 to master
3101dcc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@springmeyer @artemp